projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.108' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
fs
/
udf
/
inode.c
diff --git
a/fs/udf/inode.c
b/fs/udf/inode.c
index 5c1120a5fa427c219429a555446d64998f6f3bac..0ead8bed774a4c6591b32faabfd93d84b9169720 100644
(file)
--- a/
fs/udf/inode.c
+++ b/
fs/udf/inode.c
@@
-1237,8
+1237,8
@@
int udf_setsize(struct inode *inode, loff_t newsize)
return err;
}
set_size:
return err;
}
set_size:
- truncate_setsize(inode, newsize);
up_write(&iinfo->i_data_sem);
up_write(&iinfo->i_data_sem);
+ truncate_setsize(inode, newsize);
} else {
if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
down_write(&iinfo->i_data_sem);
} else {
if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
down_write(&iinfo->i_data_sem);
@@
-1255,9
+1255,9
@@
set_size:
udf_get_block);
if (err)
return err;
udf_get_block);
if (err)
return err;
+ truncate_setsize(inode, newsize);
down_write(&iinfo->i_data_sem);
udf_clear_extent_cache(inode);
down_write(&iinfo->i_data_sem);
udf_clear_extent_cache(inode);
- truncate_setsize(inode, newsize);
udf_truncate_extents(inode);
up_write(&iinfo->i_data_sem);
}
udf_truncate_extents(inode);
up_write(&iinfo->i_data_sem);
}