Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6-omap-h63xx.git] / fs / gfs2 / inode.c

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 3b87c188da41c59eabe5f082f7e832e94c0fa079..7b277d4491558f4e360ac8c51002237009535775 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -16,7 +16,6 @@
 #include <linux/sort.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
-#include <linux/lm_interface.h>
 #include <linux/security.h>
 #include <linux/time.h>
 
@@ -137,16 +136,16 @@ void gfs2_set_iop(struct inode *inode)
 
        if (S_ISREG(mode)) {
                inode->i_op = &gfs2_file_iops;
-               if (sdp->sd_args.ar_localflocks)
-                       inode->i_fop = &gfs2_file_fops_nolock;
+               if (gfs2_localflocks(sdp))
+                       inode->i_fop = gfs2_file_fops_nolock;
                else
-                       inode->i_fop = &gfs2_file_fops;
+                       inode->i_fop = gfs2_file_fops;
        } else if (S_ISDIR(mode)) {
                inode->i_op = &gfs2_dir_iops;
-               if (sdp->sd_args.ar_localflocks)
-                       inode->i_fop = &gfs2_dir_fops_nolock;
+               if (gfs2_localflocks(sdp))
+                       inode->i_fop = gfs2_dir_fops_nolock;
                else
-                       inode->i_fop = &gfs2_dir_fops;
+                       inode->i_fop = gfs2_dir_fops;
        } else if (S_ISLNK(mode)) {
                inode->i_op = &gfs2_symlink_iops;
        } else {