aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf/inode.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2010-10-20 16:17:28 -0400
committerJan Kara <jack@suse.cz>2011-01-06 11:03:55 -0500
commitc03cad241af63445b751781a09faf08b3a5b77c1 (patch)
tree2e6f329259d442c23829c218a21977bbd6a5d248 /fs/udf/inode.c
parent949f4a7c08bc4a050eae7aeeac3e6d019d1feafb (diff)
udf: Protect default inode credentials by rwlock
Superblock carries credentials (uid, gid, etc.) which are used as default values in __udf_read_inode() when media does not provide these. These credentials can change during remount so we protect them by a rwlock so that each inode gets a consistent set of credentials. Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/inode.c')
-rw-r--r--fs/udf/inode.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 9656907f4b81..fa3c1541151c 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1201,6 +1201,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
1201 return; 1201 return;
1202 } 1202 }
1203 1203
1204 read_lock(&sbi->s_cred_lock);
1204 inode->i_uid = le32_to_cpu(fe->uid); 1205 inode->i_uid = le32_to_cpu(fe->uid);
1205 if (inode->i_uid == -1 || 1206 if (inode->i_uid == -1 ||
1206 UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_IGNORE) || 1207 UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_IGNORE) ||
@@ -1213,13 +1214,6 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
1213 UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_SET)) 1214 UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_SET))
1214 inode->i_gid = UDF_SB(inode->i_sb)->s_gid; 1215 inode->i_gid = UDF_SB(inode->i_sb)->s_gid;
1215 1216
1216 inode->i_nlink = le16_to_cpu(fe->fileLinkCount);
1217 if (!inode->i_nlink)
1218 inode->i_nlink = 1;
1219
1220 inode->i_size = le64_to_cpu(fe->informationLength);
1221 iinfo->i_lenExtents = inode->i_size;
1222
1223 if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY && 1217 if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY &&
1224 sbi->s_fmode != UDF_INVALID_MODE) 1218 sbi->s_fmode != UDF_INVALID_MODE)
1225 inode->i_mode = sbi->s_fmode; 1219 inode->i_mode = sbi->s_fmode;
@@ -1229,6 +1223,14 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
1229 else 1223 else
1230 inode->i_mode = udf_convert_permissions(fe); 1224 inode->i_mode = udf_convert_permissions(fe);
1231 inode->i_mode &= ~sbi->s_umask; 1225 inode->i_mode &= ~sbi->s_umask;
1226 read_unlock(&sbi->s_cred_lock);
1227
1228 inode->i_nlink = le16_to_cpu(fe->fileLinkCount);
1229 if (!inode->i_nlink)
1230 inode->i_nlink = 1;
1231
1232 inode->i_size = le64_to_cpu(fe->informationLength);
1233 iinfo->i_lenExtents = inode->i_size;
1232 1234
1233 if (iinfo->i_efe == 0) { 1235 if (iinfo->i_efe == 0) {
1234 inode->i_blocks = le64_to_cpu(fe->logicalBlocksRecorded) << 1236 inode->i_blocks = le64_to_cpu(fe->logicalBlocksRecorded) <<