Skip to contentSkip to conversation

GFS2: Eliminate always-0 return from gfs2_set_mode

PATCH New Bob Peterson 2 participants 2 messages Mar 19, 2014 1 message not in the archive GFS2 file system

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 GFS2: Eliminate always-0 return from gfs2_set_mode

Hi,

This patch eliminates a return code from function gfs2_set_mode that was always 0. We could also just eliminate the function altogether because after the recent acl reforms, it's only called in one place.

Regards,

Bob Peterson
Red Hat File Systems

---

fs/gfs2/acl.c +2 -8
index 394dc55..568f650 100644
@@ -64,16 +64,12 @@ struct posix_acl *gfs2_get_acl(struct inode *inode, int type)
 	return acl;
 }
 
-static int gfs2_set_mode(struct inode *inode, umode_t mode)
+static void gfs2_set_mode(struct inode *inode, umode_t mode)
 {
-	int error = 0;
-
 	if (mode != inode->i_mode) {
 		inode->i_mode = mode;
 		mark_inode_dirty(inode);
 	}
-
-	return error;
 }
 
 int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
@@ -98,9 +94,7 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 		if (error == 0)
 			acl = NULL;
 
-		error = gfs2_set_mode(inode, mode);
-		if (error)
-			return error;
+		gfs2_set_mode(inode, mode);
 	}
 
 	if (acl) {
#2 lore raw

PATCH 1/1 GFS2: Eliminate always-0 return from gfs2_set_mode

Hi,

Yes, I think we might as well just merge it in, if there is only one caller,

Steve.

Quoted 47 lines · Bob Peterson

Hi,

This patch eliminates a return code from function gfs2_set_mode that was always 0. We could also just eliminate the function altogether because after the recent acl reforms, it's only called in one place.

Regards,

Bob Peterson
Red Hat File Systems

---

fs/gfs2/acl.c +2 -8
index 394dc55..568f650 100644
@@ -64,16 +64,12 @@ struct posix_acl *gfs2_get_acl(struct inode *inode, int type)
 	return acl;
 }
 
-static int gfs2_set_mode(struct inode *inode, umode_t mode)
+static void gfs2_set_mode(struct inode *inode, umode_t mode)
 {
-	int error = 0;
-
 	if (mode != inode->i_mode) {
 		inode->i_mode = mode;
 		mark_inode_dirty(inode);
 	}
-
-	return error;
 }
 
 int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
@@ -98,9 +94,7 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 		if (error == 0)
 			acl = NULL;
 
-		error = gfs2_set_mode(inode, mode);
-		if (error)
-			return error;
+		gfs2_set_mode(inode, mode);
 	}
 
 	if (acl) {