1 files changed, 4 insertions, 2 deletions

diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 1501db4f0e6..040b5a2e655 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -106,8 +106,6 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
 {
         struct inode *inode = NULL;
 
-        d_set_d_op(dentry, &gfs2_dops);
-
         inode = gfs2_lookupi(dir, &dentry->d_name, 0);
         if (inode && IS_ERR(inode))
                 return ERR_CAST(inode);
@@ -1427,6 +1425,10 @@ static long gfs2_fallocate(struct inode *inode, int mode, loff_t offset,
         loff_t next = (offset + len - 1) >> sdp->sd_sb.sb_bsize_shift;
         next = (next + 1) << sdp->sd_sb.sb_bsize_shift;
 
+        /* We only support the FALLOC_FL_KEEP_SIZE mode */
+        if (mode && (mode != FALLOC_FL_KEEP_SIZE))
+                return -EOPNOTSUPP;
+
         offset = (offset >> sdp->sd_sb.sb_bsize_shift) <<
                  sdp->sd_sb.sb_bsize_shift;