Skip to contentSkip to conversation

pnfs: delete an unintended goto

PATCH In review Dan Carpenter 2 participants 2 messages Feb 10, 2015

Subsystems (3)
Kernel janitors NFS client NFS server
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 pnfs: delete an unintended goto

There was an extra goto here where it shouldn't be, because of a merge error.

Fixes e2c63e091e29 ('Merge branch 'flexfiles'')
Signed-off-by Dan Carpenter <[email protected]>
fs/nfs/pnfs.c +0 -1
index 107b321..4f802b02 100644
@@ -1078,7 +1078,6 @@ bool pnfs_roc(struct inode *ino)
 			goto out_noroc;
 	}
 
-		goto out_noroc;
 	pnfs_clear_retry_layoutget(lo);
 	list_for_each_entry_safe(lseg, tmp, &lo->plh_segs, pls_list)
 		if (test_bit(NFS_LSEG_ROC, &lseg->pls_flags)) {
#1 lore raw
Quoted 11 lines · Dan Carpenter

There was an extra goto here where it shouldn't be, because of a merge error.

Fixes e2c63e091e29 ('Merge branch 'flexfiles'')
Signed-off-by Dan Carpenter <[email protected]>
fs/nfs/pnfs.c +0 -0
index 107b321..4f802b02 100644

fs/nfs/pnfs.c bool pnfs_roc(struct inode *ino) · line 1083

Quoted 7 lines
fs/nfs/pnfs.c +0 -1
@@ -1078,7 +1078,6 @@ bool pnfs_roc(struct inode *ino)
 			goto out_noroc;
 	}
 
-		goto out_noroc;
 	pnfs_clear_retry_layoutget(lo);
 	list_for_each_entry_safe(lseg, tmp, &lo->plh_segs, pls_list)
 		if (test_bit(NFS_LSEG_ROC, &lseg->pls_flags)) {

Thanks Dan! Applied to linux-next.

Cheers
Trond

Signature · 3 lines
Trond Myklebust
Linux NFS client maintainer, PrimaryData
[email protected]