X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fsysv%2Fnamei.c;h=6bd850b7641ae58bb1dd726c5ffb40fef0e0d595;hb=83ae1b79c898838e16ac8cde69b39d22d36fb035;hp=b8a73f716fbe35c5a0683017db96fc3c2d1136cd;hpb=4e907c3d45d10dc5162d283d109be425c23aeb69;p=powerpc.git

diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index b8a73f716f..6bd850b764 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -13,7 +13,6 @@
  */
 
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
 #include "sysv.h"
 
 static int add_nondir(struct dentry *dentry, struct inode *inode)
@@ -250,7 +249,7 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,
 		sysv_set_link(new_de, new_page, old_inode);
 		new_inode->i_ctime = CURRENT_TIME_SEC;
 		if (dir_de)
-			new_inode->i_nlink--;
+			drop_nlink(new_inode);
 		inode_dec_link_count(new_inode);
 	} else {
 		if (dir_de) {
@@ -292,7 +291,7 @@ out:
 /*
  * directories can handle most operations...
  */
-struct inode_operations sysv_dir_inode_operations = {
+const struct inode_operations sysv_dir_inode_operations = {
 	.create		= sysv_create,
 	.lookup		= sysv_lookup,
 	.link		= sysv_link,