Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8754bee authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

r/o bind mounts: create cleanup helper svc_msnfs() 



I'm going to be modifying nfsd_rename() shortly to support read-only bind
mounts.  This #ifdef is around the area I'm patching, and it starts to get
really ugly if I just try to add my new code by itself.  Using this little
helper makes things a lot cleaner to use.

Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Acked-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c7eb2667

fs/nfsd/vfs.c

+11 −4
Original line number Diff line number Diff line
@@ -865,6 +865,15 @@ static int nfsd_direct_splice_actor(struct pipe_inode_info *pipe, 
	return __splice_from_pipe(pipe, sd, nfsd_splice_actor);

}



static inline int svc_msnfs(struct svc_fh *ffhp)

{

#ifdef MSNFS

	return (ffhp->fh_export->ex_flags & NFSEXP_MSNFS);

#else

	return 0;

#endif

}



static __be32

nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,

              loff_t offset, struct kvec *vec, int vlen, unsigned long *count)
@@ -877,11 +886,9 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, 


	err = nfserr_perm;

	inode = file->f_path.dentry->d_inode;

#ifdef MSNFS

	if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) &&

		(!lock_may_read(inode, offset, *count)))



	if (svc_msnfs(fhp) && !lock_may_read(inode, offset, *count))

		goto out;

#endif



	/* Get readahead parameters */

	ra = nfsd_get_raparms(inode->i_sb->s_dev, inode->i_ino);