ksmbd: opencode to remove ATTR_FP macro

Opencode to remove ATTR_FP macro. Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
ambv · Jun 29, 2021 · 849fbc5 · 849fbc5
1 parent 12202c0
commit 849fbc5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/fs/ksmbd/oplock.c b/fs/ksmbd/oplock.c
@@ -1111,7 +1111,9 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid,
 		goto set_lev;
 
 	/* grant none-oplock if second open is trunc */
-	if (ATTR_FP(fp)) {
+	if (fp->attrib_only && fp->cdoption != FILE_OVERWRITE_IF_LE &&
+	    fp->cdoption != FILE_OVERWRITE_LE &&
+	    fp->cdoption != FILE_SUPERSEDE_LE) {
 		req_op_level = SMB2_OPLOCK_LEVEL_NONE;
 		goto set_lev;
 	}

diff --git a/fs/ksmbd/vfs_cache.h b/fs/ksmbd/vfs_cache.h
@@ -25,11 +25,6 @@
 #define KSMBD_NO_FID		(UINT_MAX)
 #define SMB2_NO_FID		(0xFFFFFFFFFFFFFFFFULL)
 
-#define ATTR_FP(fp) ((fp)->attrib_only && \
-		     ((fp)->cdoption != FILE_OVERWRITE_IF_LE && \
-		      (fp)->cdoption != FILE_OVERWRITE_LE && \
-		      (fp)->cdoption != FILE_SUPERSEDE_LE))
-
 struct ksmbd_conn;
 struct ksmbd_session;