projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ufs
/
balloc.c
diff --git
a/fs/ufs/balloc.c
b/fs/ufs/balloc.c
index 2c1036080d5276bcb51314e649e45f0d6f0990a5..a7106eda50241bfd28ae002986335b4d0cf8f0f6 100644
(file)
--- a/
fs/ufs/balloc.c
+++ b/
fs/ufs/balloc.c
@@
-51,8
+51,8
@@
void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)
if (ufs_fragnum(fragment) + count > uspi->s_fpg)
ufs_error (sb, "ufs_free_fragments", "internal error");
if (ufs_fragnum(fragment) + count > uspi->s_fpg)
ufs_error (sb, "ufs_free_fragments", "internal error");
-
-
lock_ufs(sb
);
+
+
mutex_lock(&UFS_SB(sb)->s_lock
);
cgno = ufs_dtog(uspi, fragment);
bit = ufs_dtogd(uspi, fragment);
cgno = ufs_dtog(uspi, fragment);
bit = ufs_dtogd(uspi, fragment);
@@
-115,13
+115,13
@@
void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)
if (sb->s_flags & MS_SYNCHRONOUS)
ubh_sync_block(UCPI_UBH(ucpi));
ufs_mark_sb_dirty(sb);
if (sb->s_flags & MS_SYNCHRONOUS)
ubh_sync_block(UCPI_UBH(ucpi));
ufs_mark_sb_dirty(sb);
-
-
unlock_ufs(sb
);
+
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
UFSD("EXIT\n");
return;
failed:
UFSD("EXIT\n");
return;
failed:
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
UFSD("EXIT (FAILED)\n");
return;
}
UFSD("EXIT (FAILED)\n");
return;
}
@@
-151,7
+151,7
@@
void ufs_free_blocks(struct inode *inode, u64 fragment, unsigned count)
goto failed;
}
goto failed;
}
-
lock_ufs(sb
);
+
mutex_lock(&UFS_SB(sb)->s_lock
);
do_more:
overflow = 0;
do_more:
overflow = 0;
@@
-211,12
+211,12
@@
do_more:
}
ufs_mark_sb_dirty(sb);
}
ufs_mark_sb_dirty(sb);
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
UFSD("EXIT\n");
return;
failed_unlock:
UFSD("EXIT\n");
return;
failed_unlock:
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
failed:
UFSD("EXIT (FAILED)\n");
return;
failed:
UFSD("EXIT (FAILED)\n");
return;
@@
-357,7
+357,7
@@
u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
usb1 = ubh_get_usb_first(uspi);
*err = -ENOSPC;
usb1 = ubh_get_usb_first(uspi);
*err = -ENOSPC;
-
lock_ufs(sb
);
+
mutex_lock(&UFS_SB(sb)->s_lock
);
tmp = ufs_data_ptr_to_cpu(sb, p);
if (count + ufs_fragnum(fragment) > uspi->s_fpb) {
tmp = ufs_data_ptr_to_cpu(sb, p);
if (count + ufs_fragnum(fragment) > uspi->s_fpb) {
@@
-378,19
+378,19
@@
u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
"fragment %llu, tmp %llu\n",
(unsigned long long)fragment,
(unsigned long long)tmp);
"fragment %llu, tmp %llu\n",
(unsigned long long)fragment,
(unsigned long long)tmp);
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
return INVBLOCK;
}
if (fragment < UFS_I(inode)->i_lastfrag) {
UFSD("EXIT (ALREADY ALLOCATED)\n");
return INVBLOCK;
}
if (fragment < UFS_I(inode)->i_lastfrag) {
UFSD("EXIT (ALREADY ALLOCATED)\n");
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
return 0;
}
}
else {
if (tmp) {
UFSD("EXIT (ALREADY ALLOCATED)\n");
return 0;
}
}
else {
if (tmp) {
UFSD("EXIT (ALREADY ALLOCATED)\n");
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
return 0;
}
}
return 0;
}
}
@@
-399,7
+399,7
@@
u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
* There is not enough space for user on the device
*/
if (!capable(CAP_SYS_RESOURCE) && ufs_freespace(uspi, UFS_MINFREE) <= 0) {
* There is not enough space for user on the device
*/
if (!capable(CAP_SYS_RESOURCE) && ufs_freespace(uspi, UFS_MINFREE) <= 0) {
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
UFSD("EXIT (FAILED)\n");
return 0;
}
UFSD("EXIT (FAILED)\n");
return 0;
}
@@
-424,7
+424,7
@@
u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
ufs_clear_frags(inode, result + oldcount,
newcount - oldcount, locked_page != NULL);
}
ufs_clear_frags(inode, result + oldcount,
newcount - oldcount, locked_page != NULL);
}
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
UFSD("EXIT, result %llu\n", (unsigned long long)result);
return result;
}
UFSD("EXIT, result %llu\n", (unsigned long long)result);
return result;
}
@@
-439,7
+439,7
@@
u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
fragment + count);
ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
locked_page != NULL);
fragment + count);
ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
locked_page != NULL);
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
UFSD("EXIT, result %llu\n", (unsigned long long)result);
return result;
}
UFSD("EXIT, result %llu\n", (unsigned long long)result);
return result;
}
@@
-477,7
+477,7
@@
u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
*err = 0;
UFS_I(inode)->i_lastfrag = max(UFS_I(inode)->i_lastfrag,
fragment + count);
*err = 0;
UFS_I(inode)->i_lastfrag = max(UFS_I(inode)->i_lastfrag,
fragment + count);
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
if (newcount < request)
ufs_free_fragments (inode, result + newcount, request - newcount);
ufs_free_fragments (inode, tmp, oldcount);
if (newcount < request)
ufs_free_fragments (inode, result + newcount, request - newcount);
ufs_free_fragments (inode, tmp, oldcount);
@@
-485,7
+485,7
@@
u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
return result;
}
return result;
}
-
unlock_ufs(sb
);
+
mutex_unlock(&UFS_SB(sb)->s_lock
);
UFSD("EXIT (FAILED)\n");
return 0;
}
UFSD("EXIT (FAILED)\n");
return 0;
}