diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:02:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:02:57 -0400 |
commit | f541ae326fa120fa5c57433e4d9a133df212ce41 (patch) | |
tree | bdbd94ec72cfc601118051cb35e8617d55510177 /fs/gfs2/inode.c | |
parent | e255357764f92afcafafbd4879b222b8c752065a (diff) | |
parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) |
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/iomap_32.c
include/linux/sched.h
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/gfs2/inode.c')
-rw-r--r-- | fs/gfs2/inode.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 3b87c188da41..7b277d449155 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/sort.h> | 16 | #include <linux/sort.h> |
17 | #include <linux/gfs2_ondisk.h> | 17 | #include <linux/gfs2_ondisk.h> |
18 | #include <linux/crc32.h> | 18 | #include <linux/crc32.h> |
19 | #include <linux/lm_interface.h> | ||
20 | #include <linux/security.h> | 19 | #include <linux/security.h> |
21 | #include <linux/time.h> | 20 | #include <linux/time.h> |
22 | 21 | ||
@@ -137,16 +136,16 @@ void gfs2_set_iop(struct inode *inode) | |||
137 | 136 | ||
138 | if (S_ISREG(mode)) { | 137 | if (S_ISREG(mode)) { |
139 | inode->i_op = &gfs2_file_iops; | 138 | inode->i_op = &gfs2_file_iops; |
140 | if (sdp->sd_args.ar_localflocks) | 139 | if (gfs2_localflocks(sdp)) |
141 | inode->i_fop = &gfs2_file_fops_nolock; | 140 | inode->i_fop = gfs2_file_fops_nolock; |
142 | else | 141 | else |
143 | inode->i_fop = &gfs2_file_fops; | 142 | inode->i_fop = gfs2_file_fops; |
144 | } else if (S_ISDIR(mode)) { | 143 | } else if (S_ISDIR(mode)) { |
145 | inode->i_op = &gfs2_dir_iops; | 144 | inode->i_op = &gfs2_dir_iops; |
146 | if (sdp->sd_args.ar_localflocks) | 145 | if (gfs2_localflocks(sdp)) |
147 | inode->i_fop = &gfs2_dir_fops_nolock; | 146 | inode->i_fop = gfs2_dir_fops_nolock; |
148 | else | 147 | else |
149 | inode->i_fop = &gfs2_dir_fops; | 148 | inode->i_fop = gfs2_dir_fops; |
150 | } else if (S_ISLNK(mode)) { | 149 | } else if (S_ISLNK(mode)) { |
151 | inode->i_op = &gfs2_symlink_iops; | 150 | inode->i_op = &gfs2_symlink_iops; |
152 | } else { | 151 | } else { |