[PATCH] udf: fix uid/gid options and add uid/gid=ignore and forget options
As Pekka Enberg pointed out, with the if still following the else, you can still get a null uid written to the disk if you specify a default uid= without uid=forget. In other words, if the desktop user is uid=1000 and the mount option uid=1000 is given ( which is done on ubuntu automatically and probably other distributions that use hal ), then if any other user besides uid 1000 owns a file then a 0 will be written to the media as the owning uid instead. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
11b0b5abb2
commit
0e6b3e5e97
@@ -1341,13 +1341,11 @@ udf_update_inode(struct inode *inode, int do_sync)
|
||||
|
||||
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_FORGET))
|
||||
fe->uid = cpu_to_le32(-1);
|
||||
else if (inode->i_uid != UDF_SB(inode->i_sb)->s_uid)
|
||||
fe->uid = cpu_to_le32(inode->i_uid);
|
||||
else fe->uid = cpu_to_le32(inode->i_uid);
|
||||
|
||||
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_FORGET))
|
||||
fe->gid = cpu_to_le32(-1);
|
||||
else if (inode->i_gid != UDF_SB(inode->i_sb)->s_gid)
|
||||
fe->gid = cpu_to_le32(inode->i_gid);
|
||||
else fe->gid = cpu_to_le32(inode->i_gid);
|
||||
|
||||
udfperms = ((inode->i_mode & S_IRWXO) ) |
|
||||
((inode->i_mode & S_IRWXG) << 2) |
|
||||
|
Reference in New Issue
Block a user