From: Dave Hansen <haveblue@us.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk,
hch@infradead.org, Dave Hansen <haveblue@us.ibm.com>
Subject: [PATCH 17/23] nfs: check mnt instead of superblock directly
Date: Wed, 11 Jul 2007 17:17:33 -0700 [thread overview]
Message-ID: <20070712001733.C031FBB7@kernel> (raw)
In-Reply-To: <20070712001710.654CD9ED@kernel>
If we depend on the inodes for writeability, we will not
catch the r/o mounts when implemented.
This patches uses __mnt_want_write(). It does not guarantee
that the mount will stay writeable after the check. But,
this is OK for one of the checks because it is just for a
printk().
The other two are probably unnecessary and duplicate existing
checks in the VFS. This won't make them better checks than
before, but it will make them detect r/o mounts.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---
lxc-dave/fs/nfs/dir.c | 3 ++-
lxc-dave/fs/nfsd/vfs.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff -puN fs/nfs/dir.c~nfs-check-mnt-instead-of-sb fs/nfs/dir.c
--- lxc/fs/nfs/dir.c~nfs-check-mnt-instead-of-sb 2007-07-10 12:46:13.000000000 -0700
+++ lxc-dave/fs/nfs/dir.c 2007-07-10 12:46:13.000000000 -0700
@@ -998,7 +998,8 @@ static int is_atomic_open(struct inode *
if (nd->flags & LOOKUP_DIRECTORY)
return 0;
/* Are we trying to write to a read only partition? */
- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
+ if (__mnt_is_readonly(nd->mnt) &&
+ (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
return 0;
return 1;
}
diff -puN fs/nfsd/vfs.c~nfs-check-mnt-instead-of-sb fs/nfsd/vfs.c
--- lxc/fs/nfsd/vfs.c~nfs-check-mnt-instead-of-sb 2007-07-10 12:46:13.000000000 -0700
+++ lxc-dave/fs/nfsd/vfs.c 2007-07-10 12:46:13.000000000 -0700
@@ -1810,7 +1810,7 @@ nfsd_permission(struct svc_export *exp,
inode->i_mode,
IS_IMMUTABLE(inode)? " immut" : "",
IS_APPEND(inode)? " append" : "",
- IS_RDONLY(inode)? " ro" : "");
+ __mnt_is_readonly(exp->ex_mnt)? " ro" : "");
dprintk(" owner %d/%d user %d/%d\n",
inode->i_uid, inode->i_gid, current->fsuid, current->fsgid);
#endif
@@ -1821,7 +1821,7 @@ nfsd_permission(struct svc_export *exp,
*/
if (!(acc & MAY_LOCAL_ACCESS))
if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) {
- if (EX_RDONLY(exp) || IS_RDONLY(inode))
+ if (EX_RDONLY(exp) || __mnt_is_readonly(exp->ex_mnt))
return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm;
_
next prev parent reply other threads:[~2007-07-12 0:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-12 0:17 [PATCH 00/23] Mount writer count API (read-only bind mounts prep) Dave Hansen
2007-07-12 0:17 ` [PATCH 01/23] rearrange may_open() to be r/o friendly Dave Hansen
2007-07-12 0:17 ` [PATCH 02/23] create cleanup helper svc_msnfs() Dave Hansen
2007-07-12 0:17 ` [PATCH 03/23] filesystem helpers for custom 'struct file's Dave Hansen
2007-07-12 0:17 ` [PATCH 04/23] r/o bind mounts: stub functions Dave Hansen
2007-07-12 0:17 ` [PATCH 05/23] elevate write count open()'d files Dave Hansen
2007-07-12 0:17 ` [PATCH 06/23] r/o bind mounts: elevate write count for some ioctls Dave Hansen
2007-07-12 0:17 ` [PATCH 07/23] elevate writer count for chown and friends Dave Hansen
2007-07-12 0:17 ` [PATCH 08/23] make access() use mnt check Dave Hansen
2007-07-12 0:17 ` [PATCH 09/23] elevate mnt writers for callers of vfs_mkdir() Dave Hansen
2007-07-12 0:17 ` [PATCH 10/23] elevate write count during entire ncp_ioctl() Dave Hansen
2007-07-12 0:17 ` [PATCH 11/23] elevate write count for link and symlink calls Dave Hansen
2007-07-12 0:17 ` [PATCH 12/23] elevate mount count for extended attributes Dave Hansen
2007-07-12 0:17 ` [PATCH 13/23] elevate write count for file_update_time() Dave Hansen
2007-07-12 0:17 ` [PATCH 14/23] mount_is_safe(): add comment Dave Hansen
2007-07-12 0:17 ` [PATCH 15/23] unix_find_other() elevate write count for touch_atime() Dave Hansen
2007-07-12 0:17 ` [PATCH 16/23] elevate write count over calls to vfs_rename() Dave Hansen
2007-07-12 0:17 ` Dave Hansen [this message]
2007-07-12 0:17 ` [PATCH 18/23] elevate writer count for do_sys_truncate() Dave Hansen
2007-07-12 0:17 ` [PATCH 19/23] elevate write count for do_utimes() Dave Hansen
2007-07-12 0:17 ` [PATCH 20/23] elevate write count for do_sys_utime() and touch_atime() Dave Hansen
2007-07-12 0:17 ` [PATCH 21/23] sys_mknodat(): elevate write count for vfs_mknod/create() Dave Hansen
2007-07-12 0:17 ` [PATCH 22/23] elevate mnt writers for vfs_unlink() callers Dave Hansen
2007-07-12 0:17 ` [PATCH 23/23] do_rmdir(): elevate write count Dave Hansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070712001733.C031FBB7@kernel \
--to=haveblue@us.ibm.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox