locks: break delegations on any attribute modification

[deliverable/linux.git] / fs / hpfs / namei.c

diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index bc9082482f6841c21a0bb520d4333fae14efcb9a..1b39afdd86fd8dbe543c476829e6919325005459 100644 (file)
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -91,8 +91,8 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
        inc_nlink(dir);
        insert_inode_hash(result);
 
-       if (result->i_uid != current_fsuid() ||
-           result->i_gid != current_fsgid() ||
+       if (!uid_eq(result->i_uid, current_fsuid()) ||
+           !gid_eq(result->i_gid, current_fsgid()) ||
            result->i_mode != (mode | S_IFDIR)) {
                result->i_uid = current_fsuid();
                result->i_gid = current_fsgid();
@@ -179,8 +179,8 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, b
 
        insert_inode_hash(result);
 
-       if (result->i_uid != current_fsuid() ||
-           result->i_gid != current_fsgid() ||
+       if (!uid_eq(result->i_uid, current_fsuid()) ||
+           !gid_eq(result->i_gid, current_fsgid()) ||
            result->i_mode != (mode | S_IFREG)) {
                result->i_uid = current_fsuid();
                result->i_gid = current_fsgid();
@@ -407,7 +407,7 @@ again:
                        /*printk("HPFS: truncating file before delete.\n");*/
                        newattrs.ia_size = 0;
                        newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-                       err = notify_change(dentry, &newattrs);
+                       err = notify_change(dentry, &newattrs, NULL);
                        put_write_access(inode);
                        if (!err)
                                goto again;