4 files changed, 22 insertions, 13 deletions

diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index be8be5040e0..64ab5225920 100644
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -143,5 +143,5 @@ const struct file_operations hpfs_file_ops =
 const struct inode_operations hpfs_file_iops =
 {
         .truncate       = hpfs_truncate,
-        .setattr        = hpfs_notify_change,
+        .setattr        = hpfs_setattr,
 };
diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h
index 42ff60ccf2a..c2ea31bae31 100644
--- a/fs/hpfs/hpfs_fn.h
+++ b/fs/hpfs/hpfs_fn.h
@@ -275,7 +275,7 @@ void hpfs_init_inode(struct inode *);
 void hpfs_read_inode(struct inode *);
 void hpfs_write_inode(struct inode *);
 void hpfs_write_inode_nolock(struct inode *);
-int hpfs_notify_change(struct dentry *, struct iattr *);
+int hpfs_setattr(struct dentry *, struct iattr *);
 void hpfs_write_if_changed(struct inode *);
 void hpfs_delete_inode(struct inode *);
 
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 85d3e1d9ac0..39a1bfbea31 100644
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -260,19 +260,28 @@ void hpfs_write_inode_nolock(struct inode *i)
         brelse(bh);
 }
 
-int hpfs_notify_change(struct dentry *dentry, struct iattr *attr)
+int hpfs_setattr(struct dentry *dentry, struct iattr *attr)
 {
         struct inode *inode = dentry->d_inode;
-        int error=0;
+        int error = -EINVAL;
+
         lock_kernel();
-        if ( ((attr->ia_valid & ATTR_SIZE) && attr->ia_size > inode->i_size) ||
-             (hpfs_sb(inode->i_sb)->sb_root == inode->i_ino) ) {
-                error = -EINVAL;
-        } else if ((error = inode_change_ok(inode, attr))) {
-        } else if ((error = inode_setattr(inode, attr))) {
-        } else {
-                hpfs_write_inode(inode);
-        }
+        if (inode->i_ino == hpfs_sb(inode->i_sb)->sb_root)
+                goto out_unlock;
+        if ((attr->ia_valid & ATTR_SIZE) && attr->ia_size > inode->i_size)
+                goto out_unlock;
+
+        error = inode_change_ok(inode, attr);
+        if (error)
+                goto out_unlock;
+
+        error = inode_setattr(inode, attr);
+        if (error)
+                goto out_unlock;
+
+        hpfs_write_inode(inode);
+
+ out_unlock:
         unlock_kernel();
         return error;
 }
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index d9c59a77544..10783f3d265 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -669,5 +669,5 @@ const struct inode_operations hpfs_dir_iops =
         .rmdir          = hpfs_rmdir,
         .mknod          = hpfs_mknod,
         .rename         = hpfs_rename,
-        .setattr        = hpfs_notify_change,
+        .setattr        = hpfs_setattr,
 };