From f8241aff751ab6edefee8b0bf0b715281cc4fa84 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 18:29:54 +0000
Subject: [PATCH] - sync vserver branch:  will help future merges - update bind
 mount patch to patch-2.6.11-rc5-bme0.06.1.diff

---
 fs/open.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/open.c b/fs/open.c
index a8aaf7e6f..1ce1b45da 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -22,10 +22,6 @@
 #include <asm/uaccess.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/vs_base.h>
-#include <linux/vs_limit.h>
-#include <linux/vs_dlimit.h>
-#include <linux/vserver/xid.h>
 #include <linux/syscalls.h>
 #include <linux/vs_limit.h>
 #include <linux/vs_dlimit.h>
@@ -622,7 +618,7 @@ asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
 	inode = dentry->d_inode;
 
 	err = -EROFS;
-	if (IS_RDONLY(inode) || (file && MNT_IS_RDONLY(file->f_vfsmnt)))
+	if (IS_RDONLY(inode) || MNT_IS_RDONLY(file->f_vfsmnt))
 		goto out_putf;
 	err = -EPERM;
 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-- 
2.47.0