fs: Give dentry to inode_change_ok() instead of inode

inode_change_ok() will be resposible for clearing capabilities and IMA
extended attributes and as such will need dentry. Give it as an argument
to inode_change_ok() instead of an inode. Also rename inode_change_ok()
to setattr_prepare() to better relect that it does also some
modifications in addition to checks.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>

1 files changed, 3 insertions, 5 deletions

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index e9214768cde9..08188743db53 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -74,10 +74,10 @@ nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp,
          * which only requires access, and "set-[ac]time-to-X" which
          * requires ownership.
          * So if it looks like it might be "set both to the same time which
-         * is close to now", and if inode_change_ok fails, then we
+         * is close to now", and if setattr_prepare fails, then we
          * convert to "set to now" instead of "set to explicit time"
          *
-         * We only call inode_change_ok as the last test as technically
+         * We only call setattr_prepare as the last test as technically
          * it is not an interface that we should be using.
          */
 #define BOTH_TIME_SET (ATTR_ATIME_SET | ATTR_MTIME_SET)
@@ -92,17 +92,15 @@ nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp,
                  * request is.  We require it be within 30 minutes of now.
                  */
                 time_t delta = iap->ia_atime.tv_sec - get_seconds();
-                struct inode *inode;
 
                 nfserr = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP);
                 if (nfserr)
                         goto done;
-                inode = d_inode(fhp->fh_dentry);
 
                 if (delta < 0)
                         delta = -delta;
                 if (delta < MAX_TOUCH_TIME_ERROR &&
-                    inode_change_ok(inode, iap) != 0) {
+                    setattr_prepare(fhp->fh_dentry, iap) != 0) {
                         /*
                          * Turn off ATTR_[AM]TIME_SET but leave ATTR_[AM]TIME.
                          * This will cause notify_change to set these times